Merge conflicts solutioned

[RRRRHHHH_Code] / ruralHouses client / src / domain / Administrator.java

diff --git a/ruralHouses client/src/domain/Administrator.java b/ruralHouses client/src/domain/Administrator.java
new file mode 100644 (file)
index 0000000..d6e9d79
--- /dev/null
+++ b/ruralHouses client/src/domain/Administrator.java
@@ -0,0 +1,62 @@
+package domain;
+
+import java.io.Serializable;
+import java.util.LinkedList;
+
+import configuration.ConfigXML;
+
+public class Administrator implements Serializable {
+
+       /**
+        * 
+        */
+       private static final long serialVersionUID = 1L;
+
+       private static Administrator admin = null;
+       private static LinkedList<RuralHouse> addRequest;
+       private static LinkedList<RuralHouse> removeRequest;
+       private static LinkedList<Account> newOwnerRequest;
+       static ConfigXML c;
+
+       private Administrator() {
+               addRequest = new LinkedList<RuralHouse>();
+               removeRequest = new LinkedList<RuralHouse>();
+               newOwnerRequest = new LinkedList<Account>();
+       }
+
+       public static Administrator getInstance() {
+               return null;
+
+
+       }
+
+       public static void saveInstance() {
+
+       }
+
+       public LinkedList<RuralHouse> getAddRequest() {
+               return addRequest;
+       }
+
+       public LinkedList<RuralHouse> getRemoveRequest() {
+               return removeRequest;
+       }
+
+       public void setAddRequest(LinkedList<RuralHouse> addRequest) {
+               Administrator.addRequest = addRequest;
+       }
+
+       public void setRemoveRequest(LinkedList<RuralHouse> removeRequest) {
+               Administrator.removeRequest = removeRequest;
+
+       }
+
+       public LinkedList<Account> getNewOwnerRequest() {
+               return newOwnerRequest;
+       }
+
+       public void setNewOwnerRequest(LinkedList<Account> newOwnerRequest) {
+               Administrator.newOwnerRequest = newOwnerRequest;
+       }
+
+}